Merge "Avoid unnecessary work." into sc-dev am: 6fc657d10f am: be6ae18c83
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15114896 Change-Id: Ie1cefe51b8def588cb703dff8314cdcc6008ee46
This commit is contained in: