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: 4ec1c08c87 am: 6cc8e2a7df

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

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