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