[automerger skipped] Merge "Add flag (set to false for now) which will enable...

[automerger skipped] Merge "Add flag (set to false for now) which will enable the use of the canvas renderer" into tm-qpr-dev am: 9e40d715 am: b6a3dbe2 -s ours

am skip reason: Merged-In If1e732f1cb461c8538b97aff8003a7b913b946e7 with SHA-1 65e974c2 is already in history

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



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