Merge "Improve Planner stability" into sc-dev am: 97938e8f18 am: 96a54994de am: d05291c63c

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

Change-Id: I8dc6dca25aa15ef442ad8907482e6d30466a41f7