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