[automerger skipped] Merge changes from topic "tej_isolate_protologging" am:...

[automerger skipped] Merge changes from topic "tej_isolate_protologging" am: d5127dce am: 975acea8 am: 806baa23 -s ours am: b3db256b -s ours

am skip reason: skip tag Change-Id I24ff96806e417ad4ee89d84f051ea790a416338f with SHA-1 e5cffdb8 is already in history

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

Change-Id: Id5895fe449936d452da2e1077befed2e8ab93b20