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

Change-Id: Ic55195e325096b049b0a4d0ae40649457cc6b0f5