Merge changes from topic "tej_isolate_protologging" am: d5127dceb0 am: 975acea8a5

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

Change-Id: I83816cc3552e0514087258cb794953cf15789bbb