Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17898014 Change-Id: Iba1f3f42b53b58216d66747b9ccb614b9cdefd28 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>