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