Merge changes from topic "tej_pull_lazy" am: eb6a9ceb2f am: 7d73b2f3ec

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1627635

Change-Id: I7ac3db59f3fecd49fd78694daa394b06406b5445