Merge "Add "operator bool" overload to android::sp." am: 28ebfe18fb am: 56c22732c6
am: a915e99e04

Change-Id: I28b9df6d67ae28ccdf6ec1af773de57fff45a49a