Merge "Revert "Don't allow std::make_shared/unique for ndk::SharedRefBase objects"" into tm-dev am: c8df26e4e2 am: ce624c313d

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

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