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