Merge "Move BaseInterface typedef from protected to public" am: 96fcd27e59 am: af1e289f74

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

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