Merge "Do not set eTraversalNeeded w/out wake up" into rvc-dev am: 4f6205d3cc am: 5a33a8a399

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

Change-Id: Ic662cdf18db77eda63b94dc520887ef6e827b861