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