Merge "Update caption handle menu to new spec." into tm-qpr-dev am: fd4db7662d am: dde5bdc5a2

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

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