Merge "Make active Context valid while buildLayer() When RecordingCanvas::drawPoints() is executed through buildLayer(), active Context is null. It leads to crash" into main am: d773035f1a am: 691b495c70 am: f70a4e86c2

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

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