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

Merge "Merge "Revert^2 "Use "SessionHint" enum in ndk API"" into udc-dev am: edea07ff am: 43e4541d am: 752e0cdb" into udc-qpr-dev-plus-aosp am: c3a75865

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



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