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

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

Change-Id: I001ee40bac1eac47b4813ca7bc0c5d1fe4cf834e