Merge "Fixed a test for app ops icons" into rvc-dev am: 0c33b0a842

Change-Id: I607c74b7445f25916fc74ba074d0ae898005e31f