Merge "Add flag (set to false for now) which will enable the use of the canvas...

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

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



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