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