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