Merge "Fixed bug: Not everyone has home controls yet, or pets." into rvc-dev am: fc86cfb5 am: f9cf277b am: e9a47c7a am: 966f60d1

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

Change-Id: I6a6137d15220284f2a72a94584f2f66009461556