[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypick-LE_summary_active-smt2rklmox" am: e27d1790 am: 2225b705 am: f0973dfa -s ours am: 96aca027 -s ours

am skip reason: Merged-In Idb746e42480f99846efb5d1e4d4a411a5a9ca296 with SHA-1 cefad1e4 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138453



Change-Id: I3d6d8cfe7f6412b84a98f6edb3b3f7a2fdec7f58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>