Merge tag 'android-5.0.2_r1' into merge_branch

Android 5.0.2 release 1

* tag 'android-5.0.2_r1': (22 commits)
  LRX22G
  "LRX22F"
  DO NOT MERGE.  Bump version to 5.0.2.
  "LRX22E"
  "LRX22D"
  "LRX22C"
  "LRX22B"
  "LRX21Z"
  "LRX21Y"
  "LRX21X"
  Increment Android versions to 5.0.1
  "LRX21W"
  "LRX21V"
  "LRX21U"
  "LRX21T"
  "LRX21S"
  "LRX21R"
  "LRX21Q"
  LRX21P
  LRX21O
  ...

Change-Id: Ifbd6d30d74e3f05bae961189837a69d3ca3568d6