Merge "Revert "Update checking of flag MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS"" into pi-dev
am: 0c6929ec04

Change-Id: I2f1c4b07946290e3adde90af82b6f7a2ec55f2b1