DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: bd834abf98

Change-Id: I180670ed08710f325b9f83edfe152f10455d856c
tree: 31384a94f48d25e54858ebd0cdd2fcd28d7f29c2
  1. framework/
  2. OsuLogin/
  3. OWNERS