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