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