Merge "Update checking of flag MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS" into pi-dev
am: 15ebbeb9fd

Change-Id: I6447f40dae907f63042024ac9558aa9ba6f6f4fd