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