Merge "Make ScopedAIBinder_Weak::promote() a const function." am: 376193980c am: 0f9f9e574e

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

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