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