Merge "Fixed bug: Not everyone has home controls yet, or pets." into rvc-dev am: fc86cfb5bd am: f9cf277bcf am: e9a47c7a10

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11933640

Change-Id: Iec20f0e1ac82b2dd677cda9946130f8ac360856c