Merge "Extract DebugDrawable from NPVC into its own class" into tm-qpr-dev am: 793936a15b am: cf8bc7b89d

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

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