[automerger skipped] Merge changes from topic "tej_isolate_protologging" am: d5127dceb0 am: 975acea8a5 am: 806baa23ba -s ours

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

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

Change-Id: Ibaab71602ed90389843202b05fa5d903aee6745d