[automerger skipped] Merge changes from topics "15_apis", "set_get_properties"...

[automerger skipped] Merge changes from topics "15_apis", "set_get_properties" am: a11a12ae am: 4301505f am: 7364147e -s ours am: 7ce8118f -s ours

am skip reason: Merged-In I6f617aad7e2776e320eaf157b3a71446143ef401 with SHA-1 b0f281bf is already in history

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



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