[automerger skipped] Merge "Clear mForceTraversal" into sc-dev am: c99c8905...

[automerger skipped] Merge "Clear mForceTraversal" into sc-dev am: c99c8905 am: 02e4beef -s ours am: d35a23c3 -s ours

am skip reason: Merged-In I839682e5daa407994de3714803e1e92c0bbbc4fe with SHA-1 98db9577 is already in history

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

Change-Id: I3a6e0ec2a91de0ef4447cfa6ee518b51839815eb