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