Merge "[Status Bar] Append "__external" to external icons." into tm-qpr-dev am: 9cf44a2a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20961401



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