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

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

Change-Id: Ia8ebd3d576f00be30734e052b3a276c9044374a2