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

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

Change-Id: Ia8d5aec6e45378efbb323f876ab0aad8c66c9d6a