Merge "Revert^2 "Use "SessionHint" enum in ndk API"" into udc-dev am: f982044859

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

Change-Id: Iaad809790622a1d45e849609a40222dd2d642153
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>