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