[automerger skipped] Merge "Implement sysprop_library API stability check" am: 8b4c9376c9 -s ours
am: c9f77c9000 -s ours
am skip reason: change_id I6d69fb418bac675bbb9e4ac25c3269dfa3029219 with SHA1 617a722048 is in history

Change-Id: I536f0e46bff5f6d8112e25128543e14245f862cc