[automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am:...

[automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267 am: d7608c84 -s ours am: 78a4048e -s ours am: b971690a -s ours am: d185f3ae -s ours am: 897c8321 -s ours am: 14ddd8b6 -s ours am: 85cad882 -s ours am: 42339b4e -s ours am: 5a51d41a -s ours

am skip reason: subject contains skip directive

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



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