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