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