Merge changes from topic "tej_pull_lazy" am: eb6a9ceb2f

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

Change-Id: Ia80d34795f3341e84c15be636dbb7e5ffd15ed39