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

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

Change-Id: I56882454c034afdab766d95f7e135e3c9ac5dae3