[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: 14c85fff -s ours am: 41d3ecca -s ours am: 5a43ab91 -s ours am: c2d5f123 -s ours am: 26d18d81 -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: Ia982ff51ed9ba8bfb82d85e058ec8deb604cc014
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>