am 8df1bedc: Merge "Frameworks/base: Fix potential NPE in Script"

* commit '8df1bedcba5bf146c49ba6b6a89e4f97c018045c':
  Frameworks/base: Fix potential NPE in Script