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

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

Change-Id: I1dddf7ad3e25c4ad0808a716a13f51c55699cb07