Merge "Fix robotests fail if turning on silky home by default" into sc-dev am: 1b0823b8

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13461409

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I68ebdddb5a34d0399bc38238397a2db4546875c2