[automerger skipped] Merge "Merge "Guard NPE in getAvailabilityStatus of...

[automerger skipped] Merge "Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev am: bdf85c22 am: 0f872612 am: 8590506c" into rvc-qpr-dev-plus-aosp am: e1436695 -s ours
am skip reason: Change-Id I7501ef393e226bb38c72a1ee465bf9c72586716b with SHA-1 c0543e83 is in history

Change-Id: Ie38369ce039cb043e4d3028c34ed39e0020fa5a5