Merge "Only call layout during layout pass" into sc-v2-dev am: 9a6f2ac14d am: 3890973345

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

Change-Id: I22576159960413e15bb2d719e8fd8c5ed4ed1d1c