[automerger skipped] Merge "Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev am: bdf85c224b
am: 0f8726124d
am: 8590506c57" into rvc-qpr-dev-plus-aosp am: e1436695ef
-s ours
am skip reason: Change-Id I7501ef393e226bb38c72a1ee465bf9c72586716b with SHA-1 c0543e833f
is in history
Change-Id: Ie38369ce039cb043e4d3028c34ed39e0020fa5a5
This commit is contained in: