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

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

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



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