Merge "Expose MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS as system API" am: 7db161b9ef am: 156a854c72

Change-Id: I4badd737378f2480cfcae86dcc1397ce2b6a84aa