Merge "Improve Planner stability" into sc-dev am: 97938e8f18 am: ac142333f2 am: 6735072722

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

Change-Id: Ibe4dae42d496b35adeb75811afe4a6c09858a24b