[automerger skipped] Merge "Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev am: bdf85c224b am: 43032a4a28" into rvc-d1-dev-plus-aosp am: 2ec6c2616b -s ours
am skip reason: Change-Id I7501ef393e226bb38c72a1ee465bf9c72586716b with SHA-1 c56ce8d647 is in history
Change-Id: I55bfd417b4ec71bfa038b9d290b41c1542ec9964
This commit is contained in: