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