Merge cherrypicks of ['android-review.googlesource.com/3548022', 'android-review.googlesource.com/3571052'] into androidx-javascriptengine-release.

Change-Id: I7f6419051107f16ca607dd928181b20f28e5c8c8