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