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