Merge changes from topic "tej_isolate_protologging" am: d5127dceb0

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

Change-Id: Ibb3c5666ff965737ced284d548345b45ef50a2ce