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