am 34718238: am 3e7d0344: Merge "Avoid adding FORWARD_LOCK flag to an updated system app"

* commit '347182386c54fd4aa4478f35b712c230eb290468':
  Avoid adding FORWARD_LOCK flag to an updated system app