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