Merge the 2020-05-05 SPL branch from AOSP-Partner

* security-aosp-pi-release:
  Cherry-pick "Refactor Regexp.prototype"

Change-Id: I963f000d02507fae7a16981df2349fdd32db24a2