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